Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

operator: Add support for blocking queries per tenant #11094

Merged
merged 23 commits into from
Nov 28, 2023
Merged

operator: Add support for blocking queries per tenant #11094

merged 23 commits into from
Nov 28, 2023

Conversation

periklis
Copy link
Collaborator

@periklis periklis commented Oct 31, 2023 •
edited by xperimental
Loading

What this PR does / why we need it:
The following PR adds support for blocking queries per tenant for the Loki Operator.

Which issue(s) this PR fixes:

LOG-4552

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@periklis periklis self-assigned this Oct 31, 2023
@periklis periklis requested review from xperimental and a team as code owners October 31, 2023 14:28
JoaoBraveCoding
JoaoBraveCoding reviewed Oct 31, 2023
View reviewed changes
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One comment but lgtm

operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
JoaoBraveCoding
JoaoBraveCoding reviewed Nov 2, 2023
View reviewed changes
operator/config/manager/kustomization.yaml Outdated Show resolved Hide resolved
operator/config/overlays/openshift/manager_related_image_patch.yaml Outdated Show resolved Hide resolved
operator/hack/lokistack_gateway_ocp.yaml Outdated Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 20, 2023 •
edited
Loading

Trivy scan found the following vulnerabilities:

periklis and others added 2 commits November 27, 2023 19:40
@periklis @xperimental
Apply suggestions from code review
5aeb9f0 
Co-authored-by: Robert Jacob <[email protected]>
@periklis
Apply code review suggestions
49b17b7 
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
@periklis
Merge branch 'main' into operator-blocking-queries
af48ac3
@periklis
Disallow empty blockedQuerySpec
98fff2f 
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
@periklis periklis enabled auto-merge (squash) November 28, 2023 10:43
@periklis periklis merged commit 21a7f96 into grafana:main Nov 28, 2023
14 checks passed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@periklis @xperimental @rhnasc
operator: Add support for blocking queries per tenant (grafana#11094)
73ff281 
Co-authored-by: Robert Jacob <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@xperimental xperimental xperimental approved these changes

Assignees

@periklis periklis

Labels
sig/operator size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@periklis @xperimental @JoaoBraveCoding